Moved test to it's own module