added a lot of configs for testing .. failed 67
refactored unit tests and fixed a couple (resources)