Misc Cleanup, Added tests, Settings now work as expected - fixes #1