small bugfix and added testing files to test a currently rather annoying
bug
IsdfasdfiI