Moved tests into unit-tests directory