fixed tests and working on 0.2 closes #15