cleanup and rename test -> tests