Working on testing, remove all unit testing and start from scratch using jasmin