Tests and Fixes #28