More comments in tests & cleaned up unused files