Starting with unit tests
Added @secure annotation and more tests