Changed Package names to adhere to java standards, created more tests