Added a test, various changes