Split up some tests and moved them to better places