Finished basic unit tests