Add Tests, Bugfix, Documentation