Cleaned up unittests
Merge remote-tracking branch 'origin/master' into dynamo_db

Conflicts:
	test.sh
Fixed merge from main.