Changed sample directory; Created unit tests