Restructures tests and adds more