Added test class, small changes