Refactored tests
Applied value classe, thanks to @xuwei-k