merged tests and code from freakyjammer and updates made for own tests