removed test class
refactored for maia