better tests, also fixes #13