Cleanup
Move two tests into seperate tests