Added some tests before submit