added anatomy tests and other various refactorings