Moved test to it's own package