updated files and added basic test