Better layout for rpm build

test/10-configure-zepp-timer-test.bats

@@ -3,7 +3,7 @@
 load 'test_helper'
 
 setup() {
-  load ../configuration/configure-zepp-timer
+  load ../configurators/configure-zepp-timer
   common_setup
 }
 
@@ -92,10 +92,9 @@ setup() {
 # bats file_tags=configure
 @test "Username is correctly normalised" {
   unset -f __credentials_dialog __call_huami_token
-  stub __credentials_dialog "fnuggi ugh : printf 'declare -a CREDS=([0]=\"gur$'\n' li$'\r' \" [1]=\"pass1234\")'"
+  stub __credentials_dialog "fnuggi ugh : printf 'declare -a CREDS=([0]=\"gur$'\n' li$'\t' \" [1]=\"pass1234\")'"
   stub __call_huami_token '"gur li " "pass1234" : printf 1'
 
-  cat /tmp/__credentials_dialog-stub-plan
   run main
 
   unstub __call_huami_token
@@ -105,7 +104,7 @@ setup() {
 # bats file_tags=configure
 @test "Password is correctly normalised" {
   unset -f __credentials_dialog __call_huami_token
-  stub __credentials_dialog "fnuggi ugh : printf 'declare -a CREDS=([0]=\"gurli\" [1]=\"pass$'\r' _ 1234\")'"
+  stub __credentials_dialog "fnuggi ugh : printf 'declare -a CREDS=([0]=\"gurli\" [1]=\"pass$'\t _ 1234\")'"
   stub __call_huami_token '"gurli" "pass _ 1234" : printf 1'
 
   run main

test/20-huami-token-generator-test.bats

@@ -3,7 +3,7 @@
 load 'test_helper'
 
 setup() {
-  load ../configuration/huami-token-generator
+  load ../systemd-generator/huami-token-generator
   common_setup
 
   export XDG_CONFIG_HOME="$TEST_TEMP_DIR/.config"