a few tests added and issues resolved