Fixes #2 #7 #11 and removes test data