Initial commit
Tests updated