Moved tests to test dir and unittest framework

Removed the lock file