Fix tests
Missed changes in moved code
Version 0.2.1