Fixed/added unit tests...more to come