Avert

Added some more unit tests