Started adding more tests