Fix some tests and added test for no element