added test for removal of atributes.
refactor existing tests a bit, free up memory.