Added Templates, Done Theme Unit Test