Combined unit tests into one project

- There was no need to have two