Clean up, naming and add a few more tests