fixed some false positives and small stuff
fixed a few small things
refactored testing