added static shit and fixed tests
removed weird shit