Fixes and added some tests