updated unit tests, cleaned up files, directories