Added better constructor and fixed tests to match