removed comments, static class
tests