- Added a bunch of fixes for testing.

Thanks to Ela!

Signed-off-by: Daniel S. Reichenbach <daniel@kogitoapp.com>