merged business logic and ui tests