Moved tests to the top