Basic unit tests
Adding flexibility