Improved tests and started working on #13