All general tests done; add custom tests