Feat/alex wan/tests

Can use instance variables instead of class varibles, so just one "@"