Tests in separate module
PR comments added