did some renaming to make sure all the naming conventions are followed
Got tests working and named appropriately