fixed broken tests and simplified move methods