Removed templates and style info; expanded test files