remove unneeded constant
slight refactors
allow running of tests just in specific directories
refactor