Fixing incorrect path
Minor changes to mixins based on tests
Adding tests for all mixins