Working on adding more tests