Fixed several tests, so that 'mvn package' now works (on ilhead2). Moved both main and test branches of 'nohadoo' to src/abandonned.