Added the user tests into the main test project - also updated the make file to a) include the user tests and b) remove all temporary files without error when doing a clean