Moved tests, fixed DESCRIPTION file
Updated tests