Updated and added more tests