more tests.. still not working properly