fix naming and added tests