Fixed manifest files
Got tests working better