#21 Added more test cases
#21 exposed variables to unit tests