Reorganized and completed unit tests and their resources