Various minor fixes, removed test data