diff --git a/.editorconfig b/.editorconfig
index 4110381..5f11cc6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,5 +8,8 @@ indent_size = 4
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[*.{yaml,yml}]
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false
diff --git a/.travis.yml b/.travis.yml
index 9886236..35aa2f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,6 @@ matrix:
             - fish # --> latest, i.e. >=3.0.2
           update: true # TODO: build should be green without, but isn't
 
-sudo: required
 before_install:
   - curl -s "https://get.sdkman.io" | bash
   - bash test/prepare_tests.sh
@@ -47,5 +46,5 @@ script:
   - ruby test/completion.rb
   - fish test/wrapper.fish
   - fish test/reinitialize.fish
-  - bash -c "source \"${HOME}/.sdkman/bin/sdkman-init.sh\" && sdk install crash 1.3.0 && sdk uninstall crash 1.3.0" && fish test/10_zombies_new.fish
-  - bash -c "rm -rf \"${HOME}/.sdkman\" &&  sed -i'.bak' -e 's/^.*\(sdkman\|SDKMAN\).*$//g' \"${HOME}/.bashrc\" && echo 'SDKMAN uninstalled'" && fish -c "echo 'y' | sdk" && fish -c "sdk version"
+  - bash test/install_uninstall_candidate.sh > /dev/null && fish test/10_zombies_new.fish
+  - bash test/remove_sdkman.sh > /dev/null && fish -c "echo 'y' | sdk" > /dev/null && fish -c "sdk version"
diff --git a/completions/sdk.fish b/completions/sdk.fish
index bd8b602..17fcb7e 100644
--- a/completions/sdk.fish
+++ b/completions/sdk.fish
@@ -28,8 +28,8 @@ function __fish_sdkman_using_command
     set cmd (commandline -opc)
 
     if [ (count $cmd) -eq 2 ]
-        if  contains $cmd[2] $argv
-        return 0
+        if contains $cmd[2] $argv
+            return 0
         end
     end
     return 1
@@ -39,8 +39,8 @@ function __fish_sdkman_specifying_candidate
     set cmd (commandline -opc)
 
     if [ (count $cmd) -eq 3 ] # currently, sdk does not support multiple versions
-        if contains $cmd[2] $argv ]
-        return 0
+        if contains $cmd[2] $argv
+            return 0
         end
     end
     return 1
diff --git a/conf.d/sdk.fish b/conf.d/sdk.fish
index ad7f981..507b212 100644
--- a/conf.d/sdk.fish
+++ b/conf.d/sdk.fish
@@ -22,8 +22,8 @@ if  begin       not test -f "$__fish_sdkman_noexport_init";
           or    env test "$__fish_sdkman_init" -nt "$__fish_sdkman_noexport_init"
     end
     mkdir -p (dirname $__fish_sdkman_noexport_init)
-    sed -e 's/^\(\s*\).*\(export\|to_path\).*$/\1:/g' "$__fish_sdkman_init" \
-        > $__fish_sdkman_noexport_init
+    sed -E -e 's/^(\s*).*(export|to_path).*$/\1:/g' "$__fish_sdkman_init" \
+        > "$__fish_sdkman_noexport_init"
 end
 
 # Runs the given command in bash, capturing some side effects
@@ -66,7 +66,7 @@ function __fish_sdkman_run_in_bash
             if test -n value
                 set -gx $var $value
                 # Note: This makes SDKMAN_OFFLINE_MODE an environment variable.
-                #       That gives it the behavariour we _want_!
+                #       That gives it the behaviour we _want_!
             end
         end
     end
diff --git a/test/install_uninstall_candidate.sh b/test/install_uninstall_candidate.sh
new file mode 100644
index 0000000..c44d3cf
--- /dev/null
+++ b/test/install_uninstall_candidate.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+    source "${HOME}/.sdkman/bin/sdkman-init.sh" \
+&&  sdk install crash 1.3.0 \
+&&  sdk uninstall crash 1.3.0
diff --git a/test/remove_sdkman.sh b/test/remove_sdkman.sh
new file mode 100644
index 0000000..f8674cb
--- /dev/null
+++ b/test/remove_sdkman.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+    rm -rf "${HOME}/.sdkman" \
+&&  sed -i'.bak' -E -e 's/^.*(sdkman|SDKMAN).*$//g' "${HOME}/.bashrc" \
+&&  echo 'SDKMAN! uninstalled'