Small fixes and new tests incoming