removed methods; updated tests; no class notation
package