Adds Tests, Bug Fixes