Added and updated tests
Deleted a few unused interfaces