Parameter checks added
Test added