Moved test code to its own package, simplified tests