Should include some more tests to be safe