Dev

Added more useful tests. Removed the command line side of things (not necessary to represent this)