+ major changes to the system. several test rewritten/renamed