Moved out tests into separate testing file