Adding tests, renamed src to lib