Separate tests from library code
Separate tests from library code
Better coding of props
Remove redundant code