Updated unit tests (leaving them in main proj for now)